From 1c80d1b0a37ae3d8a6ed9cd7617e452b80152766 Mon Sep 17 00:00:00 2001 From: Tim Deegan Date: Thu, 21 Sep 2006 15:00:50 +0100 Subject: [PATCH] [XEND] Don't prepend '/dev/' to any absolute path. Check for '/' rather than '/dev/' when translating e.g. 'hda'->'/dev/hda' Signed-off-by: Tim Deegan --- tools/python/xen/util/blkif.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/python/xen/util/blkif.py b/tools/python/xen/util/blkif.py index f877f65f90..dd4f287004 100644 --- a/tools/python/xen/util/blkif.py +++ b/tools/python/xen/util/blkif.py @@ -7,7 +7,7 @@ from xen.xend.XendLogging import log def expand_dev_name(name): if not name: return name - if re.match( '^/dev/', name ): + if re.match( '^/', name ): return name else: return '/dev/' + name @@ -65,7 +65,7 @@ def blkdev_uname_to_file(uname): fn = None if uname.find(":") != -1: (typ, fn) = uname.split(":") - if typ == "phy" and not fn.startswith("/dev/"): + if typ == "phy" and not fn.startswith("/"): fn = "/dev/%s" %(fn,) return fn -- 2.30.2